Merge version 0.9.5-3.1+rpi1 and 0.9.5-3.2 to produce 0.9.5-3.2+rpi1

diff --cc debian/changelog
index 77c0fa3dd4f3f5cbd87f9184a1731249d78b523e,01257077ee04a91e36c880e89c49905f496f5777..60cb44c6a349ead53ce4db52a5623601c7b49dc1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- openorienteering-mapper (0.9.5-3.1+rpi1) trixie-staging; urgency=medium
++openorienteering-mapper (0.9.5-3.2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 13:33:40 +0000]
 +  * Use "debian" as "provider" for "licensing information".
 +
 +  [changes brought forward from 0.7.0-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 15 Mar 2018 01:08:30 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Oct 2024 08:54:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Jan 2026 10:11:54 +0000
++
+ openorienteering-mapper (0.9.5-3.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113362)
+ 
+  -- Adrian Bunk <bunk@debian.org>  Tue, 11 Nov 2025 16:36:07 +0200
  
  openorienteering-mapper (0.9.5-3.1) unstable; urgency=medium
  

diff --cc debian/patches/series
index fdefae8fe48c5554943af379743c2f31c6e0da27,f03efbb337d1ab78f2554f844c498e59d4f71ac2..9ce4299d519cd3d843cc05ef199dedeeb61840f4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@ fix-help-data-dir.patc
  proj8.patch
  proj8.2.0.patch
  qt-5.15.9.patch
+ 0001-Fix-CMake-configuration-warnings.patch
 +force-debian-license-info.patch